Fix subdirectory issue