made PR work with x86 and ARM configs