Fixes #4741