Time Fix v2
Fix of fix of time