more logging enhancement