Fixes #4310