Fixing no-self-compare