fixed #842