Fixed #274 #301 Leaves now disappear [gh#274,301]