datetime fixing, to be continued