Fixed problem with data rendering out of order