fix for is not none check