Fixed bug that was caused by enabling the Trinity full cleanup