Fixes token expire issue