bugfix for upstream
Merge pull request #457 from cfsego/rb_bf

bugfix for upstream