Kirki bugfix