Potential crash fix