Attempt at fixing locality, closer but no cigar