Added patch for arm devices