should fix #7983