Fixing datastructure on server