Fixed Issue #114