Fix for Arm, tested.