Fixing has() again