Fix service availability bug