Tried to fix a BadTokenException