Fixed dublicating of parameters and criteria