fixed time type issues