fixed #1033