Fixed a problem with parameter ordering