Fix of the last PR

now I think it's done. :smiley: