fixed #1768