Fixed buffer appending issue internally