Server stability fix