Updated to work with Debug class changes