Fix parsing (Weekly Update)