fix fix #822