Fixing up distinct from deprecated method