HACK: weird fix, since 'subdir' stopped working