fix sloppy conditionals