Minor fix for Kirby