datetime issues resolved