fixed #811