SVY-7370 fix flow layout hang