FS-5958 this should pass it through in late mode too