Another fix for #2064 (negative checks)