[BF] Untested fix for issue #100

We will test this anyway as part of our upgrade plans.