improve fix to call_dates, call_prices further