issue #4 - fixed