#125 fix condition