fixed shitty client