UI crash fixed - Joseph