[Client] Trying to fix the binary directory selection