fixed #1297