fix find and on methods