Nfc Locations BugFix'd