Added fix for expiring token