fix #811