Fix of previous commit