fixes Issue #22