fixed #1264