Gah! Still trying to fix map