Fix for buffer mode