fix Issue #155