Fixed bobos redundant if statements.