Clause export fix rebased to be patch