Fixes #6054