Added Davide's ugly code