My answer is the same as the one Mr. Gélinas just gave you.
Effectively, that's crucial. Any bill would absolutely have to address this issue. We can't get around it. Possessing a firearms licence brings with it certain privileges. If we pretend that the problem doesn't exist and we don't do anything to fix the situation, we will have missed the point.
So my answer is yes.