Fix issue with (false==null) = true