Fixed duplication issue--still not consistent.