Candle fix by lkiv and me.