[develop] Fix #25 Condition with date