A bipartisan bill that would tweak the controversial stand your ground self-defense law sailed through the Senate Criminal Justice Committee on Monday, passing unanimously with the backing of both the National Rifle Association and Democratic Congresswoman Corrine Brown.

The measure (SB 130) by Sen. David Simmons, R-Altamonte Springs, would make several changes recommended in 2012 by Gov. Rick Scott’s Task Force on Citizen Safety and Protection, which Scott appointed amid a national uproar that followed the shooting death of teen Trayvon Martin.