made Serve() a little more sane