Fix missing KAT when it's enabled

Fix KAT - Issue 19