Trying to fix self-hosting