Made fix for error in `on_change_carrier()`. #6456