Fixed #7 - server is no longer overly attached.