this should resolve problem when we have token missing