Better handling of switching to unsupported buffer