fix Issue #35