Fixed logic error from map.`