Fix usage of Map