Fixes Issue #230