Fixing upcoming duplicate