Klic final bugfix