Applied patch from Marcelo E. Magallon <marcelo.magallon@bigfoot.com>