Fix identifier parsing