latest version - parser fix