Fixes Issue #8