hopefully fix time error issue