fixing stability issue