Add logs for tracking the issue [PART.2]