Masterserver bugfix