d()->type now returns uppercase?