Map and Resultd position swapped and corrected