Fixed the convert_date method to better convert the dates