#1687 fix