Fixing Match Entity