Make sure required params are first (#2675)

Make sure required params are first (#2675) #822