Fixes Issue #155