Fixes Issue #157