Fixing data parsing for generic and string case. This is fixing #200