Fix one small bug
Merge branch 'feat/datetime'