May fix the clock problem (updates #18)