fixed where statements