final cfx fix