fixed #1131