Fixed parser type checking