Tent saving fix for 2017