fixed #1058