serverside bugfix