Don't use my substr(1) command

Input from @drepdash