Removed double counting in buffer handling