Merge pull request #338 from jrperritt/bfv-bug

BFV bug