[NTG-context] Wrong \unit spacing

Hi, the \unit command produces wrong spacing when only the unit is given without a value. Is there a way to improve the \unit command to not print this space? \starttext \starttabulate \NC wrong spacing \EQ (\unit{micro mol}) \NC\NR \NC spacing OK \EQ (µmol) \NC\NR \NC spacing OK \EQ (3\,µmol) \NC\NR \NC spacing OK \EQ (3 \unit{micro mol}) \NC\NR \NC spacing OK \EQ (\unit{3 micro mol}) \NC\NR \stoptabulate \stoptext Marco