temp patches for R4