Client fix