fixed Time issues