fixed #1110