Issue #128 - modify code