Fresh server variation fix 1