Fix if-else fall through