Reworked BufstopMode