Fixes #6002.