Fixes Issue #99