Should fix #6782