Fixed, bad if placement