Bug fix

Add more control of dates