fixed #1355