Fix service return value