Fix serveradapter bug