fix #6041