Fix parser to use correct data