Attempting to fix duplicate issue