fixed  parsing