Revised Nico's previous commit