Final server bug fix