Fixed bug with returning values in the Trace class.