fixed #1032