Fixed ExtractParameters