We have a hack in place right now that gets it done, but this issue in general is plaguing our upgrade