Fix pushbuf behavior