Fix non-strings evaluation