Witness bug fix.