possible time bug fix?