Feature/fix find