issue #208 - fixed