fixed :ye handling in ames