fixed lawrence's duplicate issue