better respect of serviceref#unget
3 files changed