Map wrap still broken