No more vanilla buffer change