Properly resolve share token. Fixes #153