Fix service check