Fixing params count bug