Fix of last PR