Trying to fix KAT