Fixes #4886