Fixed using Map