Fix the data capture bug