issue #233 - fixed