Merged server-fix