fixing double wrap issue in client trips (#1973)