AMR bug fix on front end