Finally fixed the duplicate entries