Fix order bug