Put an ugly workaround for the buffer overrelease problem