Buffer expansion improved