Fixes #4680