Improve get-token reliability