Fix find / match for non-string