Fixes #5100