fix (unuses, but broken) if branches