Fixing the order