I would encourage this government to consider either amending, or introducing another bill at a later time to do just that.
If I remember what Professor Doob said, it was usually the case that attorneys were not releasing the people this bill would cover.