Restored original order of parameters