server EoL issue fix