Change suggested by Luciano.