#1821 fix bug