Fixes #4965