Correct edge case where Role is joined in