More server side bugfix.