(fix) Fix Broken Server Logic