Remove string checking as it doesn't work with substituted variables