Fixed things addressed by D.Torokhov to v6