fix in server, needs cleaning up, when the time is right