adapt to bbcflib changes