Fix Server for cwd