fix Issue #252