Fixing a bug with the expiration time