Fix PR #209 (original issue #208)