Fix Server too.