Fix for *SetServices issue. Thanks to Gerhard of ESMF