Fixing duplicate checks.