Fixes #2852

Fixes #2852

Pretty much.