restore commit from esteve in e7b632b