Added more log to track issues