#376 Fix params handling