would also like to fixup the ^D issue if we can.