Fixes #4982