you are right. I'll change this in another PR as this one shouldn't change how client works internally