Fix new finder misbehavior