Implement a better workaround for subproject route problems (bug #845)