Fixed extra parameters not being used correctly