#717

This really is not the correct fix. See the #717 discussions