change for Issue #129

change for Issue #129