Fix of the vaarg fix