Issues with track changes

@cvr3 You are right. This has been fixed in 3.7.21.