Make sure subdir is split off correctly