Quick parser fix