fixed #1757