549 fix condition