improve StashUntilChannel