-Fix server to use select