working on server fix