fixed #1851