fixed the needle and the haystack