Marco Fontana Minor fix