fix error because of date conversion, can fix this later/