Scabrero/samba fix join