Fixed bug with extra param not being handled properly