Fixes Issue #175