Fixing Kiwi for presentation