Bar Levy

> We need some tests for the fix to make sure we don't accidentally break it in the future. If you can add those we can look at merging it...