Fix param parsing