Fixed handling of multiple types when parsing