Fixes #4321