Issue #34 - fixed