Fix for some params