Fixing initializaton date fallback to today issue