Fixed: removing traces