Try to avoid more dead object errors