double import fix
Merge pull request #1069 from aethemba/release/bb-development

double import fix