Issue #18 - fixed