Bugfix, nog everything is KK2.1