Fix 712

Should fix #712. Didn't need to test forecast, because forecast doesn't wrap results (yet).