making the bounty less fragile
making the bounty less fragile for real this time