Rig ID mis-calculation