Was still broken. Also fixed fact id generator.