Bugfix with order fulfillment charge default