Fix IDD issue