bug fixing accordin to Patricios notes made in May 25 from Isrrael