Fix for expiration