Fixed wrong type of Map