They now draw in the proper order