Proper restore source/dest mapping