fix Issue #119