Buffer pop fix