fixed #1491