Changed bundle parsing again, still not working in binary.