issue #24 - fixed