Fixed stability issue