fix for conflicts with d2