Fixing forgotten if statements.