Keep the 0x8NNN format consistent