[midterm] Fixed: Map | item swaping

Signed-off-by: Ahmed Abdelsamad <ahmed.kamal.abdelsamad@gmail.com>