Fixes Issue #103