fixed #1061