Fix for empty_buffer