Fixed the duplicate errors