Fixed param handling.