Code

Fixed expiration calculation