Fixed and issue with NULL, TRUE & FALSE constants