Fixed Running on servers, Closes #3