fixed #931