fixed arm issues