Another fix to subdirs!