fixed #1126