Fixing services bug, not done