Fixing [ ifs