Server fix #3