Fix for #2
Fix of the fix  #2