Updated to preserve argument order, fixing bug that caused #2 to be re-opened