fix: some heuristics