fix warnings
subject of condition can be treated also as conditions