fixed work wih date