Fix slow KGW retarget