Fixes Issue #21