Fixed service script