Fixed Issue #128