Fix for remaining buffer at start.