Fixed params handling IRL