Fixed bands

This should address the issue in #172
I could not compare with the results there, but running on a background workspace the new code produces tighter bands.