Fixing buffer_online