Fixed wrong superclass for Server, Client