Fixes Issue #125