fix error and add Service time check