Fixed client move