Also fix case where parameters are passed in