Fix the subproject issue