fix for Issue #212