Fixes Issue #24