fixed #1709