Found another problem.

Marked with // KG: prefix