Fix for repeated live crash