fix for is not None check