just want to fix #822