fix for expiration time issue