Fixed problem with some parameters changing their order