Major bug fix within server