fix the _map shit