Fixed parser issue