Fixes Issue #3