Add logging, no functional change