Weird duplication issue remaining