add fix for AD issue