Fixed client overwriting register changes