Fixing ifs