Really fix the order problem, 0.24.3