fix choices_SWS for GP