Improve buffer source word