Fixed clients controller bullshit