(Hopefully) fixed DWKNearestNeighbour