[WIP] [identity] Fix for #65