more date fix