fixing r5 build