Debug and bug fix.