fixed #637