Fix service crash