Action map is now working on row properly