fixed feature issue with NULL