fixed #795