Make Picklrfind more friendly