Fix #BB-1009
Fix for #BB-1021