fixed #1849