Branch/changedir fix