fixed #1025