Server bug fix