fix Issue #228