Improve alternate buffer behavior