Better version of revision 1166 and 1165 -- corrects behavior, by changing code such...