Fix Issue #119