fix #5836