some fix to make it work on the server