Fix wrong method call
Tighter search scope