Fix condition class