Fixed major error in map between old and new table