Fixes Issue #002