Not losing params anymore