Fixed haystack inconsistency & warning