Fixes Issue #133