Fix BSAG module

I was a bit too hasty when splitting the method in two...