Changes made by Duc Nguyen (ducnt@vnyi.com).