Better parser fix