AM-9 fix