change check to avoid always returning True