fixing the order