Server Enter Bugfix