Apply review from @osaris.