I suggest using `kind=dp` consistently in all places instead of hard-coding the kind number 8 in some places.