System A id shifting corrected