[bbccouk] Fix extraction (#4104, #4214)