Updated the logging details to help find bug