Fixing ordering of dates - this is not too smart!