Fix for Forecast