Fixing the ordering once for all