fixed #1097