fix id issue
AMO bug fix