fixed #1540