Bug fix. KMCD is still not right.