Fixes Issue #187