improve compatibility to older BBB version