Fix for forecasts