Fix bug in cdd971db06391a724f03