improve fix to call_dates