Fixed bug in Service helper