fix mexico bugs