Subproject fix