Resolved an issue and added more logs·