Services Bug Fix