#1598535 fix bug