potential crash fix