Fixed clock bug