Fix/wrong date check in