issue #18 - fixed