Fix params parsing