Fixed bug
Fixed date conversion