Improve parsing to cope with empty values
Bug fix