AM-19 related fix