Params parsing fix

Alright, second time's a charm. I should have started with a branch to begin with. Thanks for reviewing.