Fixes Issue #86