Fix to make application work on server