issue #19 - fixed