Fix failing build by using explicit copy.  Should probably be re-worked to use moves instead