Reverting Juan's change