Adapted to DMD pull-request 443