Removed invalid check