fixed #1096