Quick hack to get service to start correctly