Fixed one (of many) server bugs