fixed #813