FIX for refactored index _location setting