Might have fixed evaluation of if/else statements