Fixes #4810