Make D2 work correctly