Conform to Stefano's comments