work around CARGO-1296