Fixed Issue #119