Fix Foundation and Maps conflict