Fix if.. again