[fixed] Stability issue