Fixed expiry issue