Condition class fix