Test of Federico's fix