this commit attempts to fix issues #7245