Fixes #630 - BCC

#630