It's been a while since I tried to fix it on ARM.