Fixes Issue #898