Updated fix to #issue 868 to reflect comments in issue (cleanup)