Add logging fix