issue #42 - fixed