Some fix into clock value #15