fix Issue #49