Accomodate changes in newest amd-tools (parameter ordering)