Fix bin_or_sbin variable to new convention of using bin