Fixes #630
Merge pull request #631 from ATofighi/patch-18

Fixes #630 - BCC