fixing buffer switch