Fixing bug where array parameters where cannibalized