Workaround K bug