Properly changed wrap_parameters for 1.8.7 style key