Fixes #6562