Fixed clientside crash