Fixed incorrect parsing of optional fields