Fixes Issue #156