One more date bugfix