Ensure distinct works correctly for EBDEnvironments