Fixes Issue #72