Story #1565: attempt to fix before script issue.