fixed #1030