fix in order to close service