hotfix on the server side