Fixes Issue #22