Fixed Issue #128.