fixed #1026