Master

Finder fix