Fix for trace message was moved back as been removed by mistake.