Fix ServerAdapter  #28