Fixes  Issue #18