Fix :bug: of params handling, resolve #2