Made it use correct new parameters