Fix if.. again again