fixed #915