Yet another fix attempt for the ARM issues...