Arreglo del fallo cherry-pick from c35f11b. Thks Rascarlo