Solve quarter shifting mess using wrap/unwrap functions from client library