fix: use needle pattern ..