Update of getTargetSGP to better handle minor cases