Fixed locality bug