Fix to Work with Latest Trac