Fixes BPFD-517