new fixes for stability