Fix inproper string handling
Fix inproper string handling

Change-Id: I1388385318d688e64da1c752e87058f79d72b3ba
Reviewed-on: https://blistud.com/gerrit/349
Reviewed-by: Jouni Roivas

jroivas/blieng,jroivas/blieng,jroivas/blieng,jroivas/blieng