Fix bug with unicode and structs introduced by last commit