fix for issue #207