Fixed 'Cannot redefine singleton Server' error