Fixing buffer again