* fix amc issues