Bug fixed with date