Fixed empty string case in orf