ARM-13 Review and fix ARM-9