Quick fix for /server, will do a better job later