added fix for doubled parameters