FIX: Adding no date verification on reendering.