adapt to firm CopyB changes