#385 When refilling buffer, don't add duplicates