Contribs: Yet another modification for the patch for live/OSX. SHould be last one.