Undid server fix. Made it even worse