fix time and order issue