Implement serverfix
Merge branch 'serverfix' into master branch