Bug fixed in AMRR