Fixing issue #128. Correct the wrong things in ServiceRepository