Fixes Issue #185