Conditional statements fixes 2013