Added checks for reverse-consistency