Fixed Time.now issue