Server bug correction2