server fix #4