GoodbyeServer_Stub fix