Fix a but with token not beeing received

Introduced when I was splitting my work to several commits