fixed #1081