Fixes #6644