issue #64 - fixed