Added kirchhof case