Hopefully fix issue where things were lost