Fix of the fix  #2