fixed #957