fix: Adds a secondary check and a fall back to Plain (#2118)

fix: Adds a secondary check and a fall back to Plain (#2118) #385