fixed #841