adapt to firm Cmp changes