Improve alternate buffer problem