Sri | Mostly fixed phantom buffer problem