Fixing re-order bug.