BioD: merg latest fix for 2.066