Correct serve on set change