record tracking bug fix