Tried to fix time bug...