parser fix (including location)