Small change for better support of long integers