Rebuild assert statements
Add buffer back