Actually fix services bug
Merge pull request #1552 from thockin/bugs

Actually fix services bug