Create safer identifier, fixes #94