fixed #71 on Server