Readd d8 and 17 (in lowercase)