Fixed run on server issue