Fix for the traces bug