* fixed ConditionParser