Fixes #4919