r13132: Old fix from Lars