Inbuffer now matches input behaviour