Fixes #6401